bitkeeper revision 1.1159.1.516 (41d410d7eWGB0LUnCA0Y7EAIZig5Hg)
authorsmh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Thu, 30 Dec 2004 14:29:43 +0000 (14:29 +0000)
committersmh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Thu, 30 Dec 2004 14:29:43 +0000 (14:29 +0000)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
BitKeeper/etc/ignore

index 1ff4f443164fb51ff3f98a47f2dd9ae859db6f80,de77ccebfc6440f9fc8d4291bfe7889b724486f5..e9d5e9cc4156e20ac091d5e1bf3cd26db7757498
@@@ -7,6 -7,6 +7,7 @@@
  *.tar.bz2
  *.tar.gz
  *~
++BLOG
  BitKeeper/*/*
  PENDING/*
  TAGS
@@@ -72,12 -67,10 +73,13 @@@ tools/vnet/vnet-module/.tmp_versions/
  tools/vnet/vnet-module/vnet_module.mod.*
  tools/vnetd/vnetd
  tools/web-shutdown.tap
 +tools/x2d2/minixend
  tools/xentrace/xentrace
  tools/xfrd/xfrd
++xen/BLOG
  xen/arch/x86/asm-offsets.s
  xen/arch/x86/boot/mkelf32
 +xen/ddb/*
  xen/drivers/pci/classlist.h
  xen/drivers/pci/devlist.h
  xen/drivers/pci/gen-devlist
@@@ -91,5 -84,8 +93,3 @@@ xen/tools/figlet/figle
  xen/xen
  xen/xen-syms
  xen/xen.*
- xen/BLOG
 -install/*
 -patches/ebtables-brnf-5_vs_2.4.25.diff
 -patches/ebtables.diff
 -tools/x2d2/minixend
--BLOG